Fixed bug introduced by #53 where request based functionality was being
 bypassed