Issues hot fixes - #16 & #47