Fixed issues introduced by b63364dc4fba816c6b10660ebacfdfdf27535eb1