Fixed labels. Closes #151