Even more desprate attempts to stop the non-uniqueness :\