tailgoose fix? #SGoo-83 Fixed