(hack) fixes related #110