added 'common' directory check