fix doctrine stuff but on going