Issue 310

Fixed bug!