fixes Issue #366 in a very superficial way