#133 finally fixed