Some added (cheap) safety