Hack! Not sure if this will work