#111 tested and fixed