Fixes Issued #27