Fixed issues with following behaviors.