fix calls to common