applied dualstatus patch by Andrew Milkovich <amilkovich at gmail dot com>