Added a temporary work-around