Fixed bug with last commit.
Updated for 1.6