Once more with feeling. fixes #

fixes #