move spec expansion to right place