temp bugfix while waiting for stackforge review to go through