#18 - Fix wrong FQN issue