quick and dirt fix [Issues #9 & #10]