Pull request for bug fixing

Yay bug fixing.