Whenever possible

@TheRayCenter