Fix (#34) - Alignment issues