Handle alpha better