Inception style bugfix for @mjhilton