This looks like it could be a logic issue in the core code