Resolved a (big?) bug