#145 & #144 Fixed