Bug fix: second argument is now optional