Tweak.
Did manual tests in OSX.