Fix Jaik's bug