Double declaration fix