Riya's bug removed :p