updated based on issues found via hashpanel
0.10.10