Fix Issue #2927

Thanks @andrerod~