reflect @msfconsole's changes