Fixed bug introduced during migration