Fix #1. Oops... forgot to change that code properly. =)