Bugfix 12321 cocoa