Once again, fixed a bug by Alex... sigh