Fixed a bug in 10.3.6