Got things to work on fire-12-03