temporary fix for bug