hm... this change was already made in master, can you rebase?