Fix #40. Trying a version of @MikeVelazcoMtz fix.