Better fix for issue 25