Addresses #40. Possible fix.