Fixed #516 :P