Fix #43, fix #52 :)