Dirty fix for dropped values