Fix double imported classes bug