removed crude hack to make it work