Fixed bug (inconsistency between controller & JS)