Small Code tweak