Agree, will commit now with fix