Fixed last commit

Closes #550