bugfix. bug still remained but the issue is related to migration. not this branch alone