#50 Bug Fix: Hint works properly