Resolved #13 for vanilla consistency