Last commit bug fix tweak