Possible solution for #1225