Partial fix for issue #25, not sure what else can be done on this one