this fixes #125 and #126