Quick fix for issue 55