Extended bugfix

@rpdillon