Change default behavior

@stoodder