Fix for h issue: #448