Issue #44 Migration Fix