Ryan's Bug Fix