Urgent bugfix on *COMMON