Fix for issue