bugfix for CORE2