Fixed a bug-to-be but not the main issue