Fixed baseline bug

Closes #460