Fixed a compiler error from 3rd commit