Commit

Addressed user bug introduced with JS changes