Last commit code fix