P19/P20 support & bugfix