Issues #25 & #26 fix