Issue #264

Maybe?