Fixed a last issue bug