Fixed recent bug