Proper pepocho support