Adding a temporary fix for issue 326
Adding a temporary fix for issue 326