Fix #793

Fixes #793 

Still lame, but technically better.