Core bugfix