Better lithium 0.11 compatibility