Dirty fix for bad data modeling

Relates to #535