fixing pierre's bug. dude! :s