fixed custom state assignments