Minor change based on diff
Removed Taj hackfix