Fixed Issue # 1 (Missing code)