Bug fix

@see commits