Fixed bug https://class.coursera.org/startup-001/forum/thread?thread_id=4735