Dirty fix for assets problems