Merge other loos' patch