Fixed #1614, possible solution for #1678