Temp Fix Requested by Wahib