Bug fix for the latest commit :P