layout fix for APD-577