Manual fix. Closes #441