Updated to follow @igorw's suggestion