Attempts to solve #828