Possible solution for #1077