Fix issues, #3 & #6