trying to add a dirty fix to performance issue