Update according to @nulltoken 's advice

http://stackoverflow.com/a/21029562/1011174