Fixed tablets, closes #606.