Fixing migration 18 issue - DEVELOP