Bug Fix: Duplicate declaration