Put back check of @goldenapples and added extra check