A temporary fix for the issue