Fix after #491 after #490

Talkin bout baby steps huh