Fixed (ha) critical bug