Fixed faulty merge (0d549fb8dd95c8551230873eb442cfea7a7ef1ca)