improved fix for GPSCAFFOLD-62