Fix for use in tasteful-framework