Feature/fix

@fredsterss