Development stable enough to remove warning now