Quick n' dirty fix to #199.