Workaround for issues #12 #50 #53 #57 #128