Made a potentially painful situation pretty pain f...

Made a potentially painful situation pretty pain free.