Removed hack which is fixed in MOST