Fix issue reported by FireFart