temporary fix for issue 6