Issues cerradas #411,#412