Fixed fix for issue 5 not working