Fixed a dormant bug