Temporary fix for issue 4