Fix #12

@ddoherty03 @mattdeboard Thanks!!