#487 fixing imlementation