Do not modify options - closes #16