Fixed migration issue from #22 and #23