Temporary and strange fix, which must be rejected in future