Fixed bug with falsy second param on set