fix for #170 & #179 ... suprisingly easy one :P