diff --git a/src/Decorators/StatefulDecorator.php b/src/Decorators/StatefulDecorator.php
index fc8338f69ffb48cec75acefce098cab4c848388d..7eaa2a12e2537f49ef2f979f150a8aec964f5543 100644
--- a/src/Decorators/StatefulDecorator.php
+++ b/src/Decorators/StatefulDecorator.php
@@ -30,11 +30,11 @@ final class StatefulDecorator implements ClassDecorator
 		$fromState = $classType->addMethod('_fromState');
 		$fromState->setVisibility('public');
 		$fromState->setStatic(TRUE);
-		$fromState->setReturnType('self');
+		$fromState->setReturnType('static');
 		$fromState->addParameter('state')->setType(State::class);
 		$fromState->addBody('$state->ensureVersion(1);');
 		$fromState->addBody('$self = $state->makeAnEmptyObject(self::class);');
-		$fromState->addBody("\assert(\$self instanceof self);\n");
+		$fromState->addBody("\assert(\$self instanceof static);\n");
 
 		foreach ($classType->getProperties() as $property) {
 			$propertyName = $property->getName();