Additional fix for issue 14