removed hack as it does not work well