remove hack as its no longer needed for #29 !