Fixed #68 & #69