FIX: strange bug with keystone