Added to bug reporrt