Put back TPConstants reference, it seems to be working much better now :)