correcting #49 & #50