Fix shamelessly copied from @olegded :smile: