Fix for issue @38