Attempting fix for issue 244